Revision: tla--devo--1.3--patch-15
Archive: lcourtes@laas.fr--2005-libre
Creator: Ludovic Court`es <ludovic.courtes@laas.fr>
Date: Wed Feb  1 16:11:44 CET 2006
Standard-date: 2006-02-01 15:11:44 GMT
Modified-files: libarch/cmd-undo.c libarch/undo.c
    libarch/undo.h
New-patches: jani@iv.ro--public/tla--devo--1.3--patch-4
    jani@iv.ro--public/tla--imho--1.3--patch-6
    jblack@inframix.com--2004/tla--devo--1.3--patch-35
    jivera@flame.org--2004/tla--selective-undo--1.4--base-0
    jivera@flame.org--2004/tla--selective-undo--1.4--patch-1
    lcourtes@laas.fr--2005-libre/tla--devo--1.3--patch-15
    thelove@canonical.com/bazaar--devo--1.0--patch-11
Summary: Merged selective undo from `jivera@flame.org--2004'; fixed conflicts, updated code.
Keywords: selective undo

Conflicts were in `undo.c'.  The merged code used NULL pointers to denote
empty records and empty relational tables: this was replaced by
`rel_record_null' and `rel_table_nil'.  Similarly, code to check whether
FILE_LIST is empty compared it against the NULL pointer, which is no
longer valid.

It also used `rel_make_record ()' which no longer exists: replacement
requires a combination of `rel_make_field_str ()' and
`rel_make_record_1_taking ()'.
